toolbar: Use gtk_widget_class_set_accessible_role()

diff --git a/gtk/a11y/gtkcontaineraccessible.c b/gtk/a11y/gtkcontaineraccessible.c
index ae01adc87a67fac69b2029fbf58bbcc6d6d4d505..71f35d09d0335fea64e55ae45324e02f3f0f1f72 100644 (file)
--- a/gtk/a11y/gtkcontaineraccessible.c
+++ b/gtk/a11y/gtkcontaineraccessible.c
@@ -164,10 +164,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj,
   g_signal_connect (data, "add", G_CALLBACK (gtk_container_accessible_add_gtk), obj);
   g_signal_connect (data, "remove", G_CALLBACK (gtk_container_accessible_remove_gtk), obj);
 
-  if (GTK_IS_TOOLBAR (data))
-    obj->role = ATK_ROLE_TOOL_BAR;
-  else
-    obj->role = ATK_ROLE_PANEL;
+  obj->role = ATK_ROLE_PANEL;
 }
 
 static void

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 737a5f065a5e2d5c1b6a275fcd710b12ea6ffd7f..d9f93fc8b486c0a9505f6300dfc21cfecebb355a 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -381,6 +381,8 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   widget_class->style_updated = gtk_toolbar_style_updated;
   widget_class->focus = gtk_toolbar_focus;
 
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOOL_BAR);
+
   /* need to override the base class function via override_class_handler,
    * because the signal slot is not available in GtkWidgetClass
    */